Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use default value when -otelconfig option not given #894

Merged
merged 5 commits into from
Oct 9, 2023
Merged

Use default value when -otelconfig option not given #894

merged 5 commits into from
Oct 9, 2023

Conversation

adam-mateen
Copy link
Contributor

Description of the issue

The problem is some users directly start the amazon-cloudwatch-agent program.
Until recently there was no -otelconfig option.
Now there is, and it is breaking some users (missing metrics).

Description of changes

Most of the changes are refactoring some common code from start-amazon-cloudwatch-agent into tools/paths package. Ultimately I just want to reuse the same variable the start-amazon-cloudwatch-agent program uses when it generates the YAML config.

License

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Tests

  • make build, make test
  • Manually copied the linux_amd64 binaries to a test host and started the agent with the default linux config.

Requirements

Before commit the code, please do the following steps.

  1. Run make fmt and make fmt-sh
  2. Run make lint

@adam-mateen adam-mateen requested a review from a team as a code owner October 6, 2023 21:06
@codecov-commenter
Copy link

codecov-commenter commented Oct 6, 2023 •
edited
Loading

Codecov Report

Attention: 37 lines in your changes are missing coverage. Please review.

Comparison is base (96d4763) 57.58% compared to head (2d697a2) 62.41%.
Report is 419 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #894      +/-   ##
==========================================
+ Coverage   57.58%   62.41%   +4.82%     
==========================================
  Files         370      339      -31     
  Lines       17548    17106     -442     
==========================================
+ Hits        10105    10676     +571     
+ Misses       6848     5877     -971     
+ Partials      595      553      -42
Files Coverage Δ
cfg/commonconfig/commonconfig.go 8.00% <ø> (ø)
...md/amazon-cloudwatch-agent-config-wizard/wizard.go 59.55% <ø> (-8.51%) ⬇️
...amazon-cloudwatch-agent/amazon-cloudwatch-agent.go 2.64% <ø> (ø)
...oudwatch-agent/register_event_logger_notwindows.go 0.00% <ø> (ø)
...-cloudwatch-agent/register_event_logger_windows.go 0.00% <ø> (ø)
cmd/config-translator/translator.go 0.00% <ø> (ø)
cmd/xray-migration/commands_unix.go 42.50% <ø> (ø)
cmd/xray-migration/commands_windows.go 42.50% <ø> (ø)
cmd/xray-migration/xray-migration.go 30.28% <ø> (ø)
handlers/agentinfo/info.go 84.94% <ø> (ø)
... and 22 more

... and 206 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

jefchien
jefchien previously approved these changes Oct 6, 2023
View reviewed changes
cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go Show resolved Hide resolved
cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go Outdated Show resolved Hide resolved
tool/paths/paths_windows.go Outdated Show resolved Hide resolved
cmd/start-amazon-cloudwatch-agent/path.go Show resolved Hide resolved
@adam-mateen
rename fConfig to fTomlConfig and pass the -otelconfig from start-ama…
a1fb4dc 
…zon-cloudwatch-agent to amazon-cloudwatch-agent.
@adam-mateen adam-mateen merged commit a8302f5 into main Oct 9, 2023
@adam-mateen adam-mateen deleted the default_otelconfig branch October 9, 2023 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@okankoAMZ okankoAMZ okankoAMZ approved these changes

@dchappa dchappa dchappa approved these changes

@jefchien jefchien jefchien left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@adam-mateen @codecov-commenter @dchappa @jefchien @okankoAMZ